Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Wed, 12 Jun 2013 12:12:47 +0000 (20:12 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Wed, 12 Jun 2013 12:12:47 +0000 (20:12 +0800)
commita4982bb9f38e1ae9447bfe8a6b1e02439d2cac6d
tree0bf77bb05628f70d58d8b9e6dc1d4eb9af7dc133
parentb42df18a101721c500117d6b9e6a3afae16fb51d
parentab2005367dc353b9c1514fb1a2f4e270e3699c90
Merge from mainline.
doc/emacs/ChangeLog
lisp/ChangeLog